hvm: More physaddrs in unsigned longs.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 2aeabacdbd1d33461c4c9b9d20cfe0df40fd0c95..ee608600a3d79b618b1403d4497ea160a5703d0a 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1613,7 +1613,7 @@ static void vmx_send_str_pio(struct cpu_user_regs *regs,
                              unsigned long inst_len, unsigned int port,
                              int sign, unsigned int size, int dir,
                              int df, unsigned long addr,
-                             unsigned long paddr, unsigned long count)
+                             paddr_t paddr, unsigned long count)
 {
     /*
      * Handle string pio instructions that cross pages or that
@@ -2455,7 +2455,7 @@ static void vmx_free_vlapic_mapping(struct domain *d)
 
 static void vmx_install_vlapic_mapping(struct vcpu *v)
 {
-    unsigned long virt_page_ma, apic_page_ma;
+    paddr_t virt_page_ma, apic_page_ma;
 
     if ( !cpu_has_vmx_virtualize_apic_accesses )
         return;

diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h
index 1d91f7d4e78fa6a06fbffa191869f2642aee273a..decdb282bb67d023a5a667cd16de7885d19d7ab7 100644 (file)
--- a/xen/include/asm-x86/hvm/io.h
+++ b/xen/include/asm-x86/hvm/io.h
@@ -149,14 +149,14 @@ static inline int register_buffered_io_handler(
     return register_io_handler(d, addr, size, action, HVM_BUFFERED_IO);
 }
 
-void send_mmio_req(unsigned char type, unsigned long gpa,
+void send_mmio_req(unsigned char type, paddr_t gpa,
                    unsigned long count, int size, paddr_t value,
                    int dir, int df, int value_is_ptr);
 void send_pio_req(unsigned long port, unsigned long count, int size,
                   paddr_t value, int dir, int df, int value_is_ptr);
 void send_timeoffset_req(unsigned long timeoff);
 void send_invalidate_req(void);
-extern void handle_mmio(unsigned long gpa);
+extern void handle_mmio(paddr_t gpa);
 extern void hvm_interrupt_post(struct vcpu *v, int vector, int type);
 extern void hvm_io_assist(void);
 extern void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq,